From 7aeac34655233748317d5ecfe51e038b7f4e006d Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Tue, 17 Feb 2009 07:54:13 +0100 Subject: [PATCH] Reflect changes in dh-ocaml --- debian/rules | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/debian/rules b/debian/rules index 2c0c70a6..f3f47ce1 100755 --- a/debian/rules +++ b/debian/rules @@ -6,26 +6,18 @@ ALL_PACKAGES := $(shell sed -ne 's/^Package: //p' debian/control) OCAMLMAJOR := 3.11 OCAMLMINOR := 0 -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -OCAML_OPT_ARCH ?= $(findstring $(DEB_BUILD_ARCH),$(OCAML_NATIVE_ARCHS)) - # Build cache (for Debian debugging) BUILDCACHE := $(wildcard ../ocaml.cache) -# These are defined in ocamlvars.mk, but we redefine it since ocaml is not installed +# These are defined here to avoid definition of them in ocamlvars.mk OCAML_ABI := $(OCAMLMAJOR).$(OCAMLMINOR) OCAML_STDLIB_DIR := /usr/lib/ocaml/$(OCAML_ABI) -OCAML_DLL_DIR = $(OCAML_STDLIB_DIR)/stublibs OCAML_NATIVE_ARCHS := $(shell cat debian/native-archs) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +OCAML_OPT_ARCH := $(findstring $(DEB_BUILD_ARCH),$(OCAML_NATIVE_ARCHS)) OCAML_HAVE_OCAMLOPT := $(if $(OCAML_OPT_ARCH),yes,no) - -# We do not want ocamlvars.mk to be sourced again -_cdbs_class_ocaml_vars = 1 -include /usr/share/cdbs/2/rules/ocamlinit.mk +OCAML_OCAMLDOC_DESTDIR_HTML = +include /usr/share/ocaml/ocamlinit.mk MD5SUMSDIR = /var/lib/ocaml/md5sums INSTDIR = $(CURDIR)/debian/tmp/usr -- 2.30.2